Skip to content

move stage0.txt to toplevel directory #56285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 2 commits into from
Closed

move stage0.txt to toplevel directory #56285

wants to merge 2 commits into from

Conversation

Keruspe
Copy link
Contributor

@Keruspe Keruspe commented Nov 27, 2018

This way all files needed by packagers now reside in toplevel

@Keruspe
move stage0.txt to toplevel directory
c4e0b89 
This way all files needed by packagers now reside in toplevel

Signed-off-by: Marc-Antoine Perennou <[email protected]>
@rust-highfive
Copy link
Contributor

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 27, 2018
@Mark-Simulacrum
Copy link
Member

Is there a particular advantage to doing this? I wasn't aware that packagers cared too much about this -- I personally prefer to have as few top-level files as possible.

r? @alexcrichton

@alexcrichton
Copy link
Member

@bors: r+

Eh I don't feel too strongly either way about this, so seems fine to me!

@bors
Copy link
Collaborator

bors commented Nov 27, 2018

📌 Commit c4e0b89 has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 27, 2018
@pietroalbini pietroalbini mentioned this pull request Nov 28, 2018
Closed
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Nov 28, 2018
@pietroalbini
Rollup merge of rust-lang#56285 - Keruspe:stage0, r=alexcrichton
e9fc4ba 
move stage0.txt to toplevel directory

This way all files needed by packagers now reside in toplevel
@pietroalbini pietroalbini mentioned this pull request Nov 29, 2018
Closed
@Mark-Simulacrum
Copy link
Member

@bors rollup

kennytm added a commit to kennytm/rust that referenced this pull request Nov 30, 2018
@kennytm
Rollup merge of rust-lang#56285 - Keruspe:stage0, r=alexcrichton
d63893f 
move stage0.txt to toplevel directory

This way all files needed by packagers now reside in toplevel
@kennytm kennytm mentioned this pull request Nov 30, 2018
Closed
@kennytm
Copy link
Member

kennytm commented Nov 30, 2018

@bors r-

This failed x86_64-gnu-distcheck in #56376 (comment), because the new stage0.txt is not in the source tarball.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 30, 2018
@Keruspe
rustbuild: properly dist stage0.txt
610dcb4 
Signed-off-by: Marc-Antoine Perennou <[email protected]>
@Keruspe
Copy link
Contributor Author

Keruspe commented Dec 1, 2018

@Mark-Simulacrum It's mainly to make things "easier" for packagers. We use this for bootstrapping.

@kennytm should be fixed new

@kennytm kennytm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 1, 2018
@kennytm
Copy link
Member

kennytm commented Dec 1, 2018

@bors r=alexcrichton

@bors
Copy link
Collaborator

bors commented Dec 1, 2018

📌 Commit 610dcb4 has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 1, 2018
Centril added a commit to Centril/rust that referenced this pull request Dec 1, 2018
@Centril
Rollup merge of rust-lang#56285 - Keruspe:stage0, r=alexcrichton
3b49529 
move stage0.txt to toplevel directory

This way all files needed by packagers now reside in toplevel
@Centril Centril mentioned this pull request Dec 1, 2018
Closed
@pietroalbini
Copy link
Member

@bors r-

Caused the rollup to fail:

[00:11:10] configure: run `python /checkout/obj/build/tmp/distcheck/x.py --help`
[00:11:10] configure: 
[00:11:10] Traceback (most recent call last):
[00:11:10]   File "/checkout/obj/build/tmp/distcheck/src/bootstrap/bootstrap.py", line 870, in <module>
[00:11:10]     main()
[00:11:10]   File "/checkout/obj/build/tmp/distcheck/src/bootstrap/bootstrap.py", line 853, in main
[00:11:10]     bootstrap(help_triggered)
[00:11:10]   File "/checkout/obj/build/tmp/distcheck/src/bootstrap/bootstrap.py", line 810, in bootstrap
[00:11:10]     data = stage0_data(build.rust_root)
[00:11:10]   File "/checkout/obj/build/tmp/distcheck/src/bootstrap/bootstrap.py", line 158, in stage0_data
[00:11:10]     with open(nightlies, 'r') as nightlies:
[00:11:10] IOError: [Errno 2] No such file or directory: '/checkout/obj/build/tmp/distcheck/stage0.txt'
[00:11:10] Makefile:58: recipe for target 'check' failed

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 2, 2018
@Keruspe
Copy link
Contributor Author

Keruspe commented Dec 2, 2018

Well, it should have been a trivial change and it already made two rollups fail.

Definitely not worth it to keep trying, sorry about that guys!

@Keruspe Keruspe closed this Dec 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@Keruspe @rust-highfive @Mark-Simulacrum @alexcrichton @bors @kennytm @pietroalbini @nikomatsakis